Add support for building -mm, -tip and -rc upstream trees.

(note that not all of those contains Xen support just yet and that a
native kernel will be silently built in that case.)

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>

diff --git a/.hgignore b/.hgignore
index 63eb8880dfd4fd748a7d8abcd64cd613b85d58cb..03d4a03f2e7dbab295f20e46722ad1883036aee2 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -67,6 +67,9 @@
 ^linux-[^/]*-xen0/.*$
 ^linux-[^/]*-xenU/.*$
 ^linux-[^/]*-paravirt/.*$
+^linux-[^/]*-mm/.*$
+^linux-[^/]*-rc/.*$
+^linux-[^/]*-tip/.*$
 ^linux-[^/]*\.patch$
 ^mkddbxen$
 ^netbsd-[^/]*-tools/.*$

diff --git a/buildconfigs/mk.linux-2.6-mm b/buildconfigs/mk.linux-2.6-mm
new file mode 100644 (file)
index 0000000..9007c10
--- /dev/null
+++ b/buildconfigs/mk.linux-2.6-mm
@@ -0,0 +1,14 @@
+XEN_LINUX_SOURCE ?= tarball
+LINUX_VER ?= 2.6-mm
+
+XEN_LINUX_TARBALL_KETCHUP := y
+
+IMAGE_TARGET ?= vmlinux bzImage
+
+XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
+
+XEN_LINUX_CONFIG_UPDATE := buildconfigs/enable-xen-config
+
+EXTRAVERSION ?=
+
+include buildconfigs/mk.linux-2.6-xen

diff --git a/buildconfigs/mk.linux-2.6-rc b/buildconfigs/mk.linux-2.6-rc
new file mode 100644 (file)
index 0000000..58c19b8
--- /dev/null
+++ b/buildconfigs/mk.linux-2.6-rc
@@ -0,0 +1,14 @@
+XEN_LINUX_SOURCE ?= tarball
+LINUX_VER ?= 2.6-rc
+
+XEN_LINUX_TARBALL_KETCHUP := y
+
+IMAGE_TARGET ?= vmlinux bzImage
+
+XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
+
+XEN_LINUX_CONFIG_UPDATE := buildconfigs/enable-xen-config
+
+EXTRAVERSION ?=
+
+include buildconfigs/mk.linux-2.6-xen

diff --git a/buildconfigs/mk.linux-2.6-tip b/buildconfigs/mk.linux-2.6-tip
new file mode 100644 (file)
index 0000000..6f9cac1
--- /dev/null
+++ b/buildconfigs/mk.linux-2.6-tip
@@ -0,0 +1,14 @@
+XEN_LINUX_SOURCE ?= tarball
+LINUX_VER ?= 2.6-tip
+
+XEN_LINUX_TARBALL_KETCHUP := y
+
+IMAGE_TARGET ?= vmlinux bzImage
+
+XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
+
+XEN_LINUX_CONFIG_UPDATE := buildconfigs/enable-xen-config
+
+EXTRAVERSION ?=
+
+include buildconfigs/mk.linux-2.6-xen

diff --git a/buildconfigs/src.tarball b/buildconfigs/src.tarball
index b7f551c59ae8821efe8449974beea62f81b5a44b..1a52c39410c65a5bd7782fd617db07952590f46f 100644 (file)
--- a/buildconfigs/src.tarball
+++ b/buildconfigs/src.tarball
@@ -6,7 +6,7 @@ XEN_LINUX_TARBALL_KETCHUP ?= n
 
 LINUX_SRCDIR ?= linux-$(LINUX_VER)
 
-KETCHUP ?= buildconfigs/ketchup
+KETCHUP ?= python buildconfigs/ketchup
 
 vpath linux-%.tar.bz2 $(LINUX_SRC_PATH)